static void
gdk_win32_window_set_icon_list (GdkWindow *window,
- GList *pixbufs)
+ GList *surfaces)
{
- GdkPixbuf *pixbuf, *big_pixbuf, *small_pixbuf;
+ cairo_surface_t *surface, *big_surface, *small_surface;
+ GdkPixbuf *big_pixbuf, *small_pixbuf;
gint big_diff, small_diff;
gint big_w, big_h, small_w, small_h;
gint w, h;
small_h = GetSystemMetrics (SM_CYSMICON);
/* find closest sized icons in the list */
- big_pixbuf = NULL;
- small_pixbuf = NULL;
+ big_surface = NULL;
+ small_surface = NULL;
big_diff = 0;
small_diff = 0;
- while (pixbufs)
+ while (surfaces)
{
- pixbuf = (GdkPixbuf*) pixbufs->data;
- w = gdk_pixbuf_get_width (pixbuf);
- h = gdk_pixbuf_get_height (pixbuf);
+ surface = (GdkPixbuf*) surfaces->data;
+ w = cairo_image_surface_get_width (surface);
+ h = cairo_image_surface_get_height (surface);
dw = ABS (w - big_w);
dh = ABS (h - big_h);
diff = dw*dw + dh*dh;
- if (big_pixbuf == NULL || diff < big_diff)
- {
- big_pixbuf = pixbuf;
- big_diff = diff;
- }
+ if (big_surface == NULL || diff < big_diff)
+ {
+ big_surface = surface;
+ big_diff = diff;
+ }
dw = ABS (w - small_w);
dh = ABS (h - small_h);
diff = dw*dw + dh*dh;
- if (small_pixbuf == NULL || diff < small_diff)
- {
- small_pixbuf = pixbuf;
- small_diff = diff;
- }
+ if (small_surface == NULL || diff < small_diff)
+ {
+ small_surface = surface;
+ small_diff = diff;
+ }
- pixbufs = pixbufs->next;
+ surfaces = surfaces->next;
}
/* Create the icons */
+ big_pixbuf = gdk_pixbuf_get_from_surface (big_surface, 0, 0,
+ cairo_image_surface_get_width (big_surface)
+ cairo_image_surface_get_height (big_surface));
big_hicon = _gdk_win32_pixbuf_to_hicon (big_pixbuf);
+ g_object_unref (big_pixbuf);
+ small_pixbuf = gdk_pixbuf_get_from_surface (small_surface, 0, 0,
+ cairo_image_surface_get_width (small_surface)
+ cairo_image_surface_get_height (small_surface));
small_hicon = _gdk_win32_pixbuf_to_hicon (small_pixbuf);
+ g_object_unref (small_pixbuf);
/* Set the icons */
SendMessageW (GDK_WINDOW_HWND (window), WM_SETICON, ICON_BIG,
GList *icon_list)
{
GdkToplevelX11 *toplevel;
- GdkPixbuf *best_icon;
+ cairo_surface_t *best_icon;
GList *tmp_list;
int best_size;
-
+
toplevel = _gdk_x11_window_get_toplevel (window);
if (toplevel->icon_pixmap != NULL)
cairo_surface_destroy (toplevel->icon_pixmap);
toplevel->icon_pixmap = NULL;
}
-
+
if (toplevel->icon_mask != NULL)
{
cairo_surface_destroy (toplevel->icon_mask);
toplevel->icon_mask = NULL;
}
-
+
#define IDEAL_SIZE 48
-
+
best_size = G_MAXINT;
best_icon = NULL;
for (tmp_list = icon_list; tmp_list; tmp_list = tmp_list->next)
{
- GdkPixbuf *pixbuf = tmp_list->data;
+ cairo_surface_t *surface = tmp_list->data;
int this;
-
+
/* average width and height - if someone passes in a rectangular
* icon they deserve what they get.
*/
- this = gdk_pixbuf_get_width (pixbuf) + gdk_pixbuf_get_height (pixbuf);
+ this = cairo_image_surface_get_width (surface) + cairo_image_surface_get_height (surface);
this /= 2;
-
+
if (best_icon == NULL)
{
- best_icon = pixbuf;
+ best_icon = surface;
best_size = this;
}
else
(ABS (best_size - IDEAL_SIZE) <
ABS (this - IDEAL_SIZE)))
{
- best_icon = pixbuf;
+ best_icon = surface;
best_size = this;
}
}
if (best_icon)
{
- int width = gdk_pixbuf_get_width (best_icon);
- int height = gdk_pixbuf_get_height (best_icon);
+ int width = cairo_image_surface_get_width (best_icon);
+ int height = cairo_image_surface_get_height (best_icon);
cairo_t *cr;
toplevel->icon_pixmap = gdk_x11_window_create_pixmap_surface (window,
cr = cairo_create (toplevel->icon_pixmap);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
- gdk_cairo_set_source_pixbuf (cr, best_icon, 0, 0);
- if (gdk_pixbuf_get_has_alpha (best_icon))
+ cairo_set_source_surface (cr, best_icon, 0, 0);
+ if (cairo_surface_get_content (best_icon) == CAIRO_CONTENT_COLOR_ALPHA)
{
/* Saturate the image, so it has bilevel alpha */
cairo_push_group_with_content (cr, CAIRO_CONTENT_COLOR_ALPHA);
cairo_paint (cr);
cairo_destroy (cr);
- if (gdk_pixbuf_get_has_alpha (best_icon))
+ if (cairo_surface_get_content (best_icon) == CAIRO_CONTENT_COLOR_ALPHA)
{
toplevel->icon_mask = _gdk_x11_window_create_bitmap_surface (window,
width,
height);
cr = cairo_create (toplevel->icon_mask);
- gdk_cairo_set_source_pixbuf (cr, best_icon, 0, 0);
+ cairo_set_source_surface (cr, best_icon, 0, 0);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
cairo_paint (cr);
cairo_destroy (cr);
static void
gdk_x11_window_set_icon_list (GdkWindow *window,
- GList *pixbufs)
+ GList *surfaces)
{
gulong *data;
guchar *pixels;
gulong *p;
gint size;
GList *l;
- GdkPixbuf *pixbuf;
+ cairo_surface_t *surface;
gint width, height, stride;
gint x, y;
- gint n_channels;
GdkDisplay *display;
gint n;
-
+ cairo_format_t format;
+
if (GDK_WINDOW_DESTROYED (window) ||
!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
return;
display = gdk_window_get_display (window);
-
- l = pixbufs;
+
size = 0;
n = 0;
- while (l)
+ for (l = surfaces; l != NULL; l = l->next)
{
- pixbuf = l->data;
- g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
+ surface = l->data;
+
+ width = cairo_image_surface_get_width (surface);
+ height = cairo_image_surface_get_height (surface);
+ format = cairo_image_surface_get_format (surface);
+
+ if (format != CAIRO_FORMAT_ARGB32 && format != CAIRO_FORMAT_RGB24)
+ continue;
- width = gdk_pixbuf_get_width (pixbuf);
- height = gdk_pixbuf_get_height (pixbuf);
-
/* silently ignore overlarge icons */
if (size + 2 + width * height > GDK_SELECTION_MAX_SIZE(display))
- break;
-
+ break;
+
n++;
size += 2 + width * height;
-
- l = l->next;
}
data = g_malloc (size * sizeof (gulong));
- l = pixbufs;
p = data;
- while (l && n > 0)
+ for (l = surfaces; l != NULL && n > 0; l = l->next)
{
- pixbuf = l->data;
-
- width = gdk_pixbuf_get_width (pixbuf);
- height = gdk_pixbuf_get_height (pixbuf);
- stride = gdk_pixbuf_get_rowstride (pixbuf);
- n_channels = gdk_pixbuf_get_n_channels (pixbuf);
-
+ surface = l->data;
+
+ width = cairo_image_surface_get_width (surface);
+ height = cairo_image_surface_get_height (surface);
+ stride = cairo_image_surface_get_stride (surface);
+ format = cairo_image_surface_get_format (surface);
+
+ if (format != CAIRO_FORMAT_ARGB32 && format != CAIRO_FORMAT_RGB24)
+ continue;
+
*p++ = width;
*p++ = height;
- pixels = gdk_pixbuf_get_pixels (pixbuf);
+ pixels = cairo_image_surface_get_data (surface);
for (y = 0; y < height; y++)
{
for (x = 0; x < width; x++)
{
guchar r, g, b, a;
-
- r = pixels[y*stride + x*n_channels + 0];
- g = pixels[y*stride + x*n_channels + 1];
- b = pixels[y*stride + x*n_channels + 2];
- if (n_channels >= 4)
- a = pixels[y*stride + x*n_channels + 3];
- else
- a = 255;
-
+ a = 255;
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+ if (format == CAIRO_FORMAT_ARGB32)
+ a = pixels[y*stride + x*4 + 3];
+ r = pixels[y*stride + x*4 + 2];
+ g = pixels[y*stride + x*4 + 1];
+ b = pixels[y*stride + x*4 + 0];
+#else
+ if (format == CAIRO_FORMAT_ARGB32)
+ a = pixels[y*stride + x*4 + 0];
+ r = pixels[y*stride + x*4 + 1];
+ g = pixels[y*stride + x*4 + 2];
+ b = pixels[y*stride + x*4 + 3];
+#endif
+
*p++ = a << 24 | r << 16 | g << 8 | b ;
}
}
- l = l->next;
n--;
}
g_free (data);
- gdk_window_update_icon (window, pixbufs);
+ gdk_window_update_icon (window, surfaces);
}
static gboolean
projects / gtk4.git / commitdiff